Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Templates modal implementation #1909

Merged
merged 7 commits into from
Feb 12, 2024

Conversation

thecalcc
Copy link
Contributor

@thecalcc thecalcc commented Feb 8, 2024

SDBELGA-764

@thecalcc thecalcc requested a review from tomaskikutis February 8, 2024 11:27
@thecalcc
Copy link
Contributor Author

thecalcc commented Feb 8, 2024

image

@tomaskikutis
Copy link
Member

image

Add a gap horizontally between select and filter input. Make the two have equal height.

@fritzSF
Copy link
Contributor

fritzSF commented Feb 8, 2024

Hi @thecalcc, the design is not OK. You have the HTML code here: https://ui-framework.superdesk.org/#/playgrounds/react/test-ground (click on the "PLANNING TEMPLATES" button at the top). No need for improvisation.

@tomaskikutis
Copy link
Member

@fritzSF we agreed we'll be removing dropdown component from the framework, so I asked Konstantin not to use it in new code. We'll try to make it looks the same.

client/components/Main/CreateNewSubnavDropdown.tsx Outdated Show resolved Hide resolved
client/components/Main/CreateNewSubnavDropdown.tsx Outdated Show resolved Hide resolved
client/components/PlanningTemplatesModal.tsx Outdated Show resolved Hide resolved
client/components/PlanningTemplatesModal.tsx Outdated Show resolved Hide resolved
client/components/PlanningTemplatesModal.tsx Outdated Show resolved Hide resolved
@thecalcc thecalcc requested a review from tomaskikutis February 8, 2024 15:11
@petrjasek petrjasek added this to the 2.8 milestone Feb 12, 2024
const activeCalendarName = this.props.calendars
.find((cal) => cal.qcode === this.state.activeCalendarFilter)?.name;
const dropdownLabel = this.state.activeCalendarFilter
? `${gettext('Calendar')}: ${activeCalendarName}`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gettext doesn't work well with string literals, better use:

gettext('Calendar: {{activeCalendarName}}', {activeCalendarName});

@thecalcc
Copy link
Contributor Author

@MarkLark86 @devketanpro can you please check the failing test on your side locally? I can't get it to run properly thus can't fix it. From my POV the input hasn't changed so it should be working correctly, but please check it if you have the e2e setup working correctly locally.

@thecalcc thecalcc merged commit 238298b into superdesk:develop Feb 12, 2024
16 of 17 checks passed
@MarkLark86 MarkLark86 modified the milestones: 2.8, 2.7 Feb 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants